Index: PGConnection.m
==================================================================
--- PGConnection.m
+++ PGConnection.m
@@ -112,11 +112,11 @@
 				values[i++] = [parameter UTF8String];
 			else if ([parameter isKindOfClass: [OFNumber class]]) {
 				OFNumber *number = parameter;
 
 				switch ([number type]) {
-				case OF_NUMBER_BOOL:
+				case OF_NUMBER_TYPE_BOOL:
 					if ([number boolValue])
 						values[i++] = "t";
 					else
 						values[i++] = "f";
 					break;

Index: PGResultRow.m
==================================================================
--- PGResultRow.m
+++ PGResultRow.m
@@ -1,9 +1,9 @@
 #import "PGResultRow.h"
 
 static id
-convert_type(PGresult *res, int column, OFString *string)
+convertType(PGresult *res, int column, OFString *string)
 {
 	switch (PQftype(res, column)) {
 	case 16:  /* BOOLOID */
 		if ([string isEqual: @"t"])
 			return [OFNumber numberWithBool: YES];
@@ -92,11 +92,11 @@
 		column = PQfnumber(_res, [key UTF8String]);
 
 	if (PQgetisnull(_res, _row, column))
 		return nil;
 
-	return convert_type(_res, column,
+	return convertType(_res, column,
 	    [OFString stringWithUTF8String: PQgetvalue(_res, _row, column)]);
 }
 
 - (OFEnumerator*)keyEnumerator
 {
@@ -198,9 +198,9 @@
 		_pos++;
 
 	if (_pos >= _count)
 		return nil;
 
-	return convert_type(_res, _pos,
+	return convertType(_res, _pos,
 	    [OFString stringWithUTF8String: PQgetvalue(_res, _row, _pos++)]);
 }
 @end

Index: exceptions/PGException.m
==================================================================
--- exceptions/PGException.m
+++ exceptions/PGException.m
@@ -12,11 +12,11 @@
 
 	@try {
 		_connection = [connection retain];
 		_error = [[OFString alloc]
 		    initWithCString: PQerrorMessage([_connection PG_connection])
-			   encoding: OF_STRING_ENCODING_NATIVE];
+			   encoding: [OFString nativeOSEncoding]];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}